From c7559f57ed42dec8798f65388704fe186eb44ff3 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 10 Dec 2010 09:46:35 -0500 Subject: [PATCH] Hide GdkScreen too --- gdk/gdkinternals.h | 11 +++++++++++ gdk/gdkscreen.h | 21 +-------------------- gdk/gdktypes.h | 8 ++++---- 3 files changed, 16 insertions(+), 24 deletions(-) diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h index 19d9d2dfbb..4df0aeacf0 100644 --- a/gdk/gdkinternals.h +++ b/gdk/gdkinternals.h @@ -316,6 +316,7 @@ struct _GdkDisplayClass gboolean is_error); }; + struct _GdkKeymapClass { GObjectClass parent_class; @@ -355,6 +356,16 @@ struct _GdkKeymapClass void (*state_changed) (GdkKeymap *keymap); }; +struct _GdkScreen +{ + GObject parent_instance; + + guint closed : 1; + + cairo_font_options_t *font_options; + double resolution; /* pixels/points scale factor for fonts */ +}; + struct _GdkScreenClass { GObjectClass parent_class; diff --git a/gdk/gdkscreen.h b/gdk/gdkscreen.h index 030caad009..4b11320a4a 100644 --- a/gdk/gdkscreen.h +++ b/gdk/gdkscreen.h @@ -43,25 +43,6 @@ typedef struct _GdkScreenClass GdkScreenClass; #define GDK_IS_SCREEN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_SCREEN)) #define GDK_SCREEN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_SCREEN, GdkScreenClass)) -/** - * GdkScreen: - * - * This is a currently just a placeholder typedef for the first argument of - * the #GdkPointerHooks.window_at_pointer function in #GdkPointerHooks. - * It will be used when GDK gets multihead support. - * - * Since: 2.2 - */ -struct _GdkScreen -{ - GObject parent_instance; - - guint GSEAL (closed) : 1; - - cairo_font_options_t *GSEAL (font_options); - double GSEAL (resolution); /* pixels/points scale factor for fonts */ -}; - GType gdk_screen_get_type (void) G_GNUC_CONST; GdkVisual* gdk_screen_get_system_visual (GdkScreen *screen); GdkVisual * gdk_screen_get_rgba_visual (GdkScreen *screen); @@ -118,4 +99,4 @@ GList *gdk_screen_get_window_stack (GdkScreen *screen); G_END_DECLS -#endif /* __GDK_SCREEN_H__ */ +#endif /* __GDK_SCREEN_H__ */ diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h index ce1e1f9e1b..410cade6d9 100644 --- a/gdk/gdktypes.h +++ b/gdk/gdktypes.h @@ -134,9 +134,9 @@ typedef guint32 GdkNativeWindow; /* Forward declarations of commonly used types */ -typedef struct _GdkColor GdkColor; +typedef struct _GdkColor GdkColor; typedef struct _GdkRGBA GdkRGBA; -typedef struct _GdkCursor GdkCursor; +typedef struct _GdkCursor GdkCursor; typedef struct _GdkVisual GdkVisual; /** @@ -145,8 +145,8 @@ typedef struct _GdkVisual GdkVisual; * An opaque structure representing an onscreen drawable. */ typedef struct _GdkWindow GdkWindow; -typedef struct _GdkDisplay GdkDisplay; -typedef struct _GdkScreen GdkScreen; +typedef struct _GdkDisplay GdkDisplay; +typedef struct _GdkScreen GdkScreen; typedef struct GdkAppLaunchContext GdkAppLaunchContext; /** -- 2.30.2